Replace deprecated QVariant types with QMetaType

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Use QVariant metaType instead of type

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
f metatype

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/common/ownsql.cpp b/src/common/ownsql.cpp
index 7b4fbd225dcfc3466b83dda371b7e1b4a075e004..3577f489479c9d35526967564f5319d52e3b2adb 100644 (file)
--- a/src/common/ownsql.cpp
+++ b/src/common/ownsql.cpp
@@ -364,34 +364,24 @@ void SqlQuery::bindValueInternal(int pos, const QVariant &value)
         return;
     }
 
-    switch (value.type()) {
-    case QVariant::Int:
-    case QVariant::Bool:
+    const auto metatype = value.metaType();
+    if (metatype == QMetaType(QMetaType::Int) || metatype == QMetaType(QMetaType::Bool)) {
         res = sqlite3_bind_int(_stmt, pos, value.toInt());
-        break;
-    case QVariant::Double:
+    } else if (metatype == QMetaType(QMetaType::Double)) {
         res = sqlite3_bind_double(_stmt, pos, value.toDouble());
-        break;
-    case QVariant::UInt:
-    case QVariant::LongLong:
-    case QVariant::ULongLong:
+    } else if (metatype == QMetaType(QMetaType::UInt) || metatype == QMetaType(QMetaType::LongLong) || metatype == QMetaType(QMetaType::ULongLong)) {
         res = sqlite3_bind_int64(_stmt, pos, value.toLongLong());
-        break;
-    case QVariant::DateTime: {
+    } else if (metatype == QMetaType(QMetaType::QDateTime)) {
         const QDateTime dateTime = value.toDateTime();
         const QString str = dateTime.toString(QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz"));
         res = sqlite3_bind_text16(_stmt, pos, str.utf16(),
             str.size() * static_cast<int>(sizeof(ushort)), SQLITE_TRANSIENT);
-        break;
-    }
-    case QVariant::Time: {
+    } else if (metatype == QMetaType(QMetaType::QTime)) {
         const QTime time = value.toTime();
         const QString str = time.toString(QStringLiteral("hh:mm:ss.zzz"));
         res = sqlite3_bind_text16(_stmt, pos, str.utf16(),
             str.size() * static_cast<int>(sizeof(ushort)), SQLITE_TRANSIENT);
-        break;
-    }
-    case QVariant::String: {
+    } else if (metatype == QMetaType(QMetaType::QString)) {
         if (!value.toString().isNull()) {
             // lifetime of string == lifetime of its qvariant
             const auto *str = static_cast<const QString *>(value.constData());
@@ -400,20 +390,14 @@ void SqlQuery::bindValueInternal(int pos, const QVariant &value)
         } else {
             res = sqlite3_bind_null(_stmt, pos);
         }
-        break;
-    }
-    case QVariant::ByteArray: {
+    } else if (metatype == QMetaType(QMetaType::QByteArray)) {
         auto ba = value.toByteArray();
         res = sqlite3_bind_text(_stmt, pos, ba.constData(), ba.size(), SQLITE_TRANSIENT);
-        break;
-    }
-    default: {
+    } else {
         QString str = value.toString();
         // SQLITE_TRANSIENT makes sure that sqlite buffers the data
         res = sqlite3_bind_text16(_stmt, pos, str.utf16(),
             (str.size()) * static_cast<int>(sizeof(QChar)), SQLITE_TRANSIENT);
-        break;
-    }
     }
     if (res != SQLITE_OK) {
         qCWarning(lcSql) << "ERROR binding SQL value:" << value << "error:" << res;

diff --git a/src/libsync/foldermetadata.cpp b/src/libsync/foldermetadata.cpp
index f3a21953d341df034c49714272020dec6899338c..38ace714d0f693d6a22159ea7bc739ed0702f820 100644 (file)
--- a/src/libsync/foldermetadata.cpp
+++ b/src/libsync/foldermetadata.cpp
@@ -400,11 +400,11 @@ void FolderMetadata::setupVersionFromExistingMetadata(const QByteArray &metadata
     }
     else if (metaDataDoc.object().contains(versionKey)) {
         const auto metadataVersionValue = metaDataDoc.object()[versionKey].toVariant();
-        if (metadataVersionValue.type() == QVariant::Type::String) {
+        if (metadataVersionValue.metaType() == QMetaType(QMetaType::QString)) {
             versionStringFromMetadata = metadataVersionValue.toString();
-        } else if (metadataVersionValue.type() == QVariant::Type::Double) {
+        } else if (metadataVersionValue.metaType() == QMetaType(QMetaType::Double)) {
             versionStringFromMetadata = QString::number(metadataVersionValue.toDouble(), 'f', 1);
-        } else if (metadataVersionValue.type() == QVariant::Type::Int) {
+        } else if (metadataVersionValue.metaType() == QMetaType(QMetaType::Int)) {
             versionStringFromMetadata = QString::number(metadataVersionValue.toInt()) + QStringLiteral(".0");
         }
     }